Skip to content

Rollup of 5 pull requests#156341

Merged
rust-bors[bot] merged 42 commits intorust-lang:mainfrom
matthiaskrgr:rollup-MPIc60x
May 8, 2026
Merged

Rollup of 5 pull requests#156341
rust-bors[bot] merged 42 commits intorust-lang:mainfrom
matthiaskrgr:rollup-MPIc60x

Conversation

@matthiaskrgr
Copy link
Copy Markdown
Member

@matthiaskrgr matthiaskrgr commented May 8, 2026

Successful merges:

r? @ghost

Create a similar rollup

cijiugechu and others added 30 commits April 24, 2026 18:33
rust-lang/rust@80d2bdb6 changed `sess` to `psess` in 2024.

`gated_spans` appears to have always been plural.
This updates the rust-version file to 045b177.
Add CI testing instructions for offload
Co-Authored-By: mu001999 <mu001999@outlook.com>
Remove outdated apple download instructions
This updates the rust-version file to f2b291d.
tshepang and others added 12 commits May 8, 2026 18:17
… r=lcnr

Resolve some cases of rust-lang#132279 by using the right typing mode in the next solver

r? @lcnr

Convert 3 FIXMEs of rust-lang#132279 to using the right typing mode when we can (`tcx.use_typing_mode_borrowck()`)

Also resolves rust-lang#155093, which I closed
fix incorrect suggestions in private import diagnostic

Resolves rust-lang#156060.

1. In nested imports like `use two::{One, ...}`, the diagnostic suggested replacing the `One` with a multi-segment path of a different module, producing invalid code like `use crate::two::{one::One, Two}`. Skip it when `single_nested == true`.
2. Stop unconditionally skipping the first segment of `import.module_path`, which can produce incorrect paths in edition 2018 and later.
3. Mark the suggestion as "directly" instead of "through the re-export" when the import's source is the definition itself.
… r=TaKO8Ki

Move tests consts

Hi I have moved some tests from ui/issues into the fitting ui/consts folder

Fixes a part of rust-lang#133895
…-unicode-span, r=Urgau

Avoid invalid spans in dotdotdot rest pattern suggestions

Fixes rust-lang#156316

The parser recovers Unicode confusables such as `···` as `...`, while keeping the original source span over the multibyte characters.

`recover_dotdotdot_rest_pat` built its suggestion by subtracting `BytePos(1)` from the end of that recovered token span. For multibyte characters, that can create a span boundary inside a UTF-8, causing diagnostic emission to ICE.

This changes the suggestion to replace the whole recovered token span with `..` instead of slicing off one byte.
rustc-dev-guide subtree update

Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@34d6968.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 8, 2026
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 8, 2026
@matthiaskrgr
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 8, 2026

📌 Commit 53526f5 has been approved by matthiaskrgr

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 8, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 8, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 8, 2026

☀️ Test successful - CI
Approved by: matthiaskrgr
Duration: 3h 14m 42s
Pushing fb0a5a5 to main...

@rust-bors rust-bors Bot merged commit fb0a5a5 into rust-lang:main May 8, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 8, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#156141 Resolve some cases of #132279 by using the right typing mod… d67a5b4123dbe32e6483f15353ba3cd43c1a126e (link)
#156244 fix incorrect suggestions in private import diagnostic 83bd23781177ab99eca636b2df56aeabd036dfb1 (link)
#156306 Move tests consts 91e872264f41c66a31916737416dc0ea4df524b8 (link)
#156333 Avoid invalid spans in dotdotdot rest pattern suggestions 9150843ef8fd76d893dc46277b0900eb39f19597 (link)
#156337 rustc-dev-guide subtree update 11a77270c2bf6f8e26caa1c61595c63582ef544d (link)

previous master: 8068e2fc9a

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 8, 2026

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 8068e2f (parent) -> fb0a5a5 (this PR)

Test differences

Show 96 test diffs

Stage 1

  • [ui] tests/ui/consts/arithmetic-expr-in-array-len.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/assoc-const-with-self-in-trait-object.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/bool-comparison-in-const-array-len.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/const-array-oob-in-range-expr.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/empty-array-index-in-struct-init.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/local-var-in-associated-const.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/method-reference-in-const-dyn-fn.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/non-constant-value-in-nested-const.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/recursive-const-stack-overflow.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/short-circuit-or-with-const-bool.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/static-lifetime-inference-from-const-array.rs: [missing] -> pass (J1)
  • [ui] tests/ui/consts/static-ref-to-const-array-element.rs: [missing] -> pass (J1)
  • [ui] tests/ui/imports/private-import-nested-suggestion-156060.rs: [missing] -> pass (J1)
  • [ui] tests/ui/imports/private-import-suggestion-path-156244.rs#edition_2015: [missing] -> pass (J1)
  • [ui] tests/ui/imports/private-import-suggestion-path-156244.rs#edition_2018: [missing] -> pass (J1)
  • [ui] tests/ui/issues/issue-17252.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-25757.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-27433.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-30891.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-33287.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-39548.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-40951.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-4387.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-44239.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-49955.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-50518.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-53275.rs: pass -> [missing] (J1)
  • [ui] tests/ui/parser/dotdotdot-rest-pattern-suggestion-span.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/consts/arithmetic-expr-in-array-len.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/assoc-const-with-self-in-trait-object.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/bool-comparison-in-const-array-len.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/const-array-oob-in-range-expr.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/empty-array-index-in-struct-init.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/local-var-in-associated-const.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/method-reference-in-const-dyn-fn.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/non-constant-value-in-nested-const.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/recursive-const-stack-overflow.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/short-circuit-or-with-const-bool.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/static-lifetime-inference-from-const-array.rs: [missing] -> pass (J0)
  • [ui] tests/ui/consts/static-ref-to-const-array-element.rs: [missing] -> pass (J0)
  • [ui] tests/ui/imports/private-import-nested-suggestion-156060.rs: [missing] -> pass (J0)
  • [ui] tests/ui/imports/private-import-suggestion-path-156244.rs#edition_2015: [missing] -> pass (J0)
  • [ui] tests/ui/imports/private-import-suggestion-path-156244.rs#edition_2018: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-17252.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-25757.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-27433.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-30891.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-33287.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-39548.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-40951.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-4387.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-44239.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-49955.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-50518.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-53275.rs: pass -> [missing] (J0)
  • [ui] tests/ui/parser/dotdotdot-rest-pattern-suggestion-span.rs: [missing] -> pass (J0)

Additionally, 40 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard fb0a5a5a9c892b351f34263d6d84da9dde72871a --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-msvc-2: 1h 55m -> 2h 34m (+34.1%)
  2. optional-x86_64-gnu-parallel-frontend: 3h 10m -> 2h 13m (-29.9%)
  3. i686-msvc-1: 3h 5m -> 2h 21m (-24.0%)
  4. dist-apple-various: 2h 1m -> 1h 32m (-23.7%)
  5. dist-s390x-linux: 1h 12m -> 1h 29m (+22.8%)
  6. x86_64-gnu-distcheck: 2h 21m -> 1h 53m (-20.3%)
  7. dist-powerpc-linux: 1h 14m -> 1h 29m (+19.8%)
  8. dist-x86_64-apple: 2h 19m -> 1h 56m (-16.4%)
  9. dist-i586-gnu-i586-i686-musl: 1h 29m -> 1h 14m (-15.9%)
  10. dist-ohos-x86_64: 1h 6m -> 1h 15m (+14.3%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

}

if !opaque_type_storage.is_empty() {
ty::tls::with(|tcx| tcx.dcx().delayed_bug(format!("{opaque_type_storage:?}")));
Copy link
Copy Markdown
Member Author

@matthiaskrgr matthiaskrgr May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (fb0a5a5): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (secondary -2.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 2
All ❌✅ (primary) - - 0

Cycles

This perf run didn't have relevant results for this metric.

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 498.048s -> 497.93s (-0.02%)
Artifact size: 397.10 MiB -> 397.14 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustc-dev-guide Area: rustc-dev-guide merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.